bitkeeper revision 1.238.1.1 (3ec50ea8__tRWWW3YrFU7F1BHqol7A)

build tweaks

diff --git a/BitKeeper/etc/ignore b/BitKeeper/etc/ignore
index eee29a136fcdac4c300ae43395906ced2b68f932..6aa6d15e32bd51e266661d918353c9752c40efe1 100644 (file)
--- a/BitKeeper/etc/ignore
+++ b/BitKeeper/etc/ignore
@@ -172,3 +172,244 @@ xen/drivers/scsi/aic7xxx/aic7xxx_proc.o
 xen/drivers/scsi/megaraid.o
 xen/image.s
 xen/include/hypervisor-ifs/hypervisor-ifs
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Command.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandDestroy.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandHelp.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandList.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandNew.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandStart.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/CommandStop.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Defaults$Handler.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Defaults.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Domain.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/InetAddressPattern.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Main.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/Settings.class
+tools/control/build-dom/uk/ac/cam/cl/xeno/domctl/StringPattern.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Command.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandDestroy.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandHelp.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandList.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandNew.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandStart.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/CommandStop.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Defaults$Handler.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Defaults.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Domain.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/InetAddressPattern.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Main.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/Settings.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/domctl/StringPattern.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Extent.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Library.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Main.java.orig
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Mode.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Parser.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/Partition.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/PartitionManager.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/RootBean.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/SystemConfigurationBean.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/VirtualBlockDevice.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/VirtualDisk.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/VirtualDiskManager.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/XML.class
+tools/control/build-xen/WEB-INF/classes/uk/ac/cam/cl/xeno/xenctl/XMLHelper.class
+tools/control/build-xen/WEB-INF/web.xml
+tools/control/build-xen/about.jsp
+tools/control/build-xen/dom-del.jsp
+tools/control/build-xen/dom-delr.jsp
+tools/control/build-xen/dom-lis.jsp
+tools/control/build-xen/dom-new.jsp
+tools/control/build-xen/dom-newr.jsp
+tools/control/build-xen/dom-sta.jsp
+tools/control/build-xen/dom-star.jsp
+tools/control/build-xen/dom-stp.jsp
+tools/control/build-xen/dom-stpr.jsp
+tools/control/build-xen/dom.jsp
+tools/control/build-xen/help.jsp
+tools/control/build-xen/img/cambridge.gif
+tools/control/build-xen/img/help.gif
+tools/control/build-xen/img/home.gif
+tools/control/build-xen/img/pixel.gif
+tools/control/build-xen/img/search.gif
+tools/control/build-xen/img/xeno.gif
+tools/control/build-xen/index.jsp
+tools/control/build-xen/newdom.jsp
+tools/control/build-xen/tmpl/about.tmpl
+tools/control/build-xen/tmpl/dom-del.tmpl
+tools/control/build-xen/tmpl/dom-delr.tmpl
+tools/control/build-xen/tmpl/dom-lis.tmpl
+tools/control/build-xen/tmpl/dom-new.tmpl
+tools/control/build-xen/tmpl/dom-newr.tmpl
+tools/control/build-xen/tmpl/dom-sta.tmpl
+tools/control/build-xen/tmpl/dom-star.tmpl
+tools/control/build-xen/tmpl/dom-stp.tmpl
+tools/control/build-xen/tmpl/dom-stpr.tmpl
+tools/control/build-xen/tmpl/dom.tmpl
+tools/control/build-xen/tmpl/dommenu.tmpl
+tools/control/build-xen/tmpl/help.tmpl
+tools/control/build-xen/tmpl/index.tmpl
+tools/control/build-xen/tmpl/install.pl
+tools/control/build-xen/tmpl/makefile
+tools/control/build-xen/tmpl/newdom.tmpl
+tools/control/build-xen/tmpl/vd-fv.tmpl
+tools/control/build-xen/tmpl/vd-pa.tmpl
+tools/control/build-xen/tmpl/vd-par.tmpl
+tools/control/build-xen/tmpl/vd-pv.tmpl
+tools/control/build-xen/tmpl/vd-vbdc.tmpl
+tools/control/build-xen/tmpl/vd-vbdcr.tmpl
+tools/control/build-xen/tmpl/vd-vbdd.tmpl
+tools/control/build-xen/tmpl/vd-vbdf.tmpl
+tools/control/build-xen/tmpl/vd-vbdfr.tmpl
+tools/control/build-xen/tmpl/vd-vbdv.tmpl
+tools/control/build-xen/tmpl/vd-vdc.tmpl
+tools/control/build-xen/tmpl/vd-vdcr.tmpl
+tools/control/build-xen/tmpl/vd-vdd.tmpl
+tools/control/build-xen/tmpl/vd-vddr.tmpl
+tools/control/build-xen/tmpl/vd-vdr.tmpl
+tools/control/build-xen/tmpl/vd-vdrr.tmpl
+tools/control/build-xen/tmpl/vd-vdv.tmpl
+tools/control/build-xen/tmpl/vd.tmpl
+tools/control/build-xen/tmpl/vdmenu.tmpl
+tools/control/build-xen/tmpl/xenofoot.def
+tools/control/build-xen/tmpl/xenohead.def
+tools/control/build-xen/tmpl/xenostyle.css
+tools/control/build-xen/vd-fv.jsp
+tools/control/build-xen/vd-pa.jsp
+tools/control/build-xen/vd-par.jsp
+tools/control/build-xen/vd-pv.jsp
+tools/control/build-xen/vd-vbdc.jsp
+tools/control/build-xen/vd-vbdcr.jsp
+tools/control/build-xen/vd-vbdd.jsp
+tools/control/build-xen/vd-vbdf.jsp
+tools/control/build-xen/vd-vbdfr.jsp
+tools/control/build-xen/vd-vbdv.jsp
+tools/control/build-xen/vd-vdc.jsp
+tools/control/build-xen/vd-vdcr.jsp
+tools/control/build-xen/vd-vdd.jsp
+tools/control/build-xen/vd-vddr.jsp
+tools/control/build-xen/vd-vdr.jsp
+tools/control/build-xen/vd-vdrr.jsp
+tools/control/build-xen/vd-vdv.jsp
+tools/control/build-xen/vd.jsp
+tools/control/build-xen/xenostyle.css
+tools/control/dist/docs/api/allclasses-frame.html
+tools/control/dist/docs/api/allclasses-noframe.html
+tools/control/dist/docs/api/constant-values.html
+tools/control/dist/docs/api/deprecated-list.html
+tools/control/dist/docs/api/help-doc.html
+tools/control/dist/docs/api/index-all.html
+tools/control/dist/docs/api/index.html
+tools/control/dist/docs/api/overview-frame.html
+tools/control/dist/docs/api/overview-summary.html
+tools/control/dist/docs/api/overview-tree.html
+tools/control/dist/docs/api/package-list
+tools/control/dist/docs/api/packages.html
+tools/control/dist/docs/api/stylesheet.css
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/Command.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandDestroy.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandHelp.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandList.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandNew.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandStart.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/CommandStop.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/Defaults.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/Domain.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/InetAddressPattern.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/Main.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/Settings.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/StringPattern.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/package-frame.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/package-summary.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/domctl/package-tree.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/Extent.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/Library.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/Mode.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/Parser.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/Partition.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/PartitionManager.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/RootBean.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/SystemConfigurationBean.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/VirtualBlockDevice.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/VirtualDisk.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/VirtualDiskManager.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/XML.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/XMLHelper.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/package-frame.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/package-summary.html
+tools/control/dist/docs/api/uk/ac/cam/cl/xeno/xenctl/package-tree.html
+tools/control/dist/docs/empty_dir
+tools/control/dist/xenctl-0.1-dev.war
+tools/control/domctl.jar
+tools/control/web/about.jsp
+tools/control/web/dom-del.jsp
+tools/control/web/dom-delr.jsp
+tools/control/web/dom-lis.jsp
+tools/control/web/dom-new.jsp
+tools/control/web/dom-newr.jsp
+tools/control/web/dom-sta.jsp
+tools/control/web/dom-star.jsp
+tools/control/web/dom-stp.jsp
+tools/control/web/dom-stpr.jsp
+tools/control/web/dom.jsp
+tools/control/web/help.jsp
+tools/control/web/index.jsp
+tools/control/web/newdom.jsp
+tools/control/web/vd-fv.jsp
+tools/control/web/vd-pa.jsp
+tools/control/web/vd-par.jsp
+tools/control/web/vd-pv.jsp
+tools/control/web/vd-vbdc.jsp
+tools/control/web/vd-vbdcr.jsp
+tools/control/web/vd-vbdd.jsp
+tools/control/web/vd-vbdf.jsp
+tools/control/web/vd-vbdfr.jsp
+tools/control/web/vd-vbdv.jsp
+tools/control/web/vd-vdc.jsp
+tools/control/web/vd-vdcr.jsp
+tools/control/web/vd-vdd.jsp
+tools/control/web/vd-vddr.jsp
+tools/control/web/vd-vdr.jsp
+tools/control/web/vd-vdrr.jsp
+tools/control/web/vd-vdv.jsp
+tools/control/web/vd.jsp
+tools/control/web/xenostyle.css
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Command.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandDestroy.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandHelp.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandNew.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandStart.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/CommandStop.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Defaults$Handler.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Defaults.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/InetAddressPattern.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Main.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/Settings.class
+tools/domctl/build/uk/ac/cam/cl/xeno/domctl/StringPattern.class
+tools/domctl/domctl.jar
+tools/internal/xi_build
+tools/internal/xi_build.o
+tools/internal/xi_create
+tools/internal/xi_create.o
+tools/internal/xi_destroy
+tools/internal/xi_destroy.o
+tools/internal/xi_start
+tools/internal/xi_start.o
+tools/internal/xi_stop
+tools/internal/xi_stop.o
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Extent.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Library.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Main.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Mode.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Parser.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/Partition.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/PartitionManager.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/VirtualBlockDevice.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/VirtualDisk.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/VirtualDiskManager.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/XML.class
+tools/vdmanager/build/uk/ac/cam/cl/xeno/vdmanager/XMLHelper.class
+tools/vdmanager/vdmanager.jar
+xen/image.dis
+xen/include/xeno/compile.h
+xen/tools/figlet/figlet

diff --git a/Makefile b/Makefile
index d8a8dd34e248fd74e0963d2a4d177a35e2b11b93..5db0761c01cec02f7b651299b107931cfcf3d265 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,6 @@
 # the initial system setup.
 
 all:   
-       bk -r co ; true
        $(MAKE) -C xen
        $(MAKE) -C tools/balloon
        $(MAKE) -C tools/control

diff --git a/tools/control/web/tmpl/makefile b/tools/control/web/tmpl/makefile
index aed826114e3faa47e3ff0c1f68e729c45ac9aa53..a9e2a1c392c2f811c606b95279c5f92c9501373c 100644 (file)
--- a/tools/control/web/tmpl/makefile
+++ b/tools/control/web/tmpl/makefile
@@ -28,7 +28,7 @@ target1 = $(target)/index.jsp $(target)/newdom.jsp $(target)/vd.jsp \
 all: $(src0) $(src1)
        ./install.pl -s -home index
        mv *.jsp  $(target)
-       cp $(src0) $(target)
+       cp -f $(src0) $(target)
 
 clean:
        rm -f $(target1)

diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
index 2d18cbc0f412f7275ed7c53f81d88f1c0b9745e7..534c4a4606c42e4f82f163b131707a2193101aad 100644 (file)
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
@@ -90,7 +90,6 @@ bzImage: vmlinux
        @$(MAKEBOOT) image.gz
 
 install: bzImage
-       cp -a arch/$(ARCH)/boot/image ../install/boot/xenolinux
        cp -a arch/$(ARCH)/boot/image.gz ../install/boot/xenolinux.gz
 
 archclean: